merge trunk
authorK. Handa <handa@gnu.org>
Sat, 18 Jan 2014 00:24:14 +0000 (09:24 +0900)
committerK. Handa <handa@gnu.org>
Sat, 18 Jan 2014 00:24:14 +0000 (09:24 +0900)
commit156b3859dedfeffbc24ec72d5bb8a14d7a1e62c2
tree6ae20167c18c58afc4229ad7d25e314151b027e6
parentb4c33080c2b523c70e359e0299f04a4bd78f4873
parentc9a41569c4855bcd7d03174349b6eeb008b18bd0
merge trunk